From d878dc8e1ad82bbdf5838ffab804d05c93e48352 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 10 Aug 2009 11:37:32 +0200 Subject: [PATCH] Increment page sequence before print of the page, not after When printing, increment page sequence before rendering of the page, not after (#590084). In opposite case it runs "end_page" function with wrong parameters when drawing a page in another thread. --- gtk/gtkprintoperation.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 93751ba5e0..e9b5bb8eca 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -2097,6 +2097,12 @@ increment_page_sequence (PrintPagesData *data) GtkPrintOperationPrivate *priv = data->op->priv; gint inc; + if (data->total == -1) + { + data->total = 0; + return; + } + /* check whether we reached last position */ if (priv->page_position == data->last_position && !(data->collated_copies > 1 && data->collated < (data->collated_copies - 1))) @@ -2230,7 +2236,7 @@ update_progress (PrintPagesData *data) text = g_strdup (_("Preparing")); } else if (priv->status == GTK_PRINT_STATUS_GENERATING_DATA) - text = g_strdup_printf (_("Printing %d"), data->total - 1); + text = g_strdup_printf (_("Printing %d"), data->total); if (text) { @@ -2660,7 +2666,7 @@ prepare_data (PrintPagesData *data) counter++; } - data->total = 0; + data->total = -1; data->collated = 0; data->uncollated = 0; @@ -2758,11 +2764,10 @@ print_pages_idle (gpointer user_data) goto out; } + increment_page_sequence (data); + if (!data->done) - { - common_render_page (data->op, data->page); - increment_page_sequence (data); - } + common_render_page (data->op, data->page); else done = priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY; -- 2.30.2